Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 18 Jan 2010 22:02:28 +0000 (22:02 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 18 Jan 2010 22:02:28 +0000 (22:02 +0000)

Trivial merge